Skip to content

Conversation

@patiencedaur
Copy link
Contributor

No description provided.

@github-actions github-actions bot temporarily deployed to translation-gh-2263-minor-fixes August 3, 2021 14:14 Inactive
@github-actions github-actions bot temporarily deployed to branch-gh-2263-minor-fixes August 3, 2021 14:14 Inactive
The Russian speech is structured with topic and focus (тема и рема).

The Russian speech is structured with topic and focus
(:ref:`тема и рема <https://ru.wikipedia.org/wiki/Актуальное_членение_предложения>`_).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We user :ref: for the links to the pages within Tarantool documentation.
Wiki is an external source, so an ordinary link will do just fine.
тема и рема <https://ru.wikipedia.org/wiki/Актуальное_членение_предложения>_

Also, not sure if "Актуальное_членение_предложения" will work here as a part of the link, but let's try.

Copy link
Contributor

@NickVolynkin NickVolynkin Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true. The :doc: and :ref: syntax is for referencing objects within the documentation project. These objects can be documents (pages), anchors, terms, function definitions, and so on. External links use the following syntax:

text text `link label <link URL>`__ more text

@github-actions github-actions bot temporarily deployed to translation-gh-2263-minor-fixes August 3, 2021 14:48 Inactive
@github-actions github-actions bot temporarily deployed to branch-gh-2263-minor-fixes August 3, 2021 14:50 Inactive
@NickVolynkin
Copy link
Contributor

NickVolynkin commented Aug 3, 2021

Too many commits. Make a rebase on the latest branch:

git fetch
git rebase origin/latest
git push -f

* - state machine
- машина состояний (конечный автомат, state machine)
- машина состояний
* - write-ahead log (WAL)” at first entry, “WAL” later
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

Copy link
Contributor Author

@patiencedaur patiencedaur Aug 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The examples are plain terms without descriptions. The previous version includes descriptions, which might create confusion and is also inconsistent with the example in the first row. Same for the punctuation. We don't want to describe source terms, because the section is about target terms.

Be critical towards your text
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Tidy up your translation until it feels just right.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem here is that feeling is personal and subjective. It can feel right to me but not to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an admonition against being inattentive or uncaring about the text. I could rephrase it as follows: "Don't forget to proofread. Check your translation at least twice." This is not the same thought, but it's along similar lines. Does that sound okay to you?

@github-actions github-actions bot temporarily deployed to branch-gh-2263-minor-fixes August 4, 2021 07:07 Inactive
@github-actions github-actions bot temporarily deployed to translation-gh-2263-minor-fixes August 4, 2021 07:07 Inactive
@github-actions github-actions bot temporarily deployed to translation-gh-2263-minor-fixes August 4, 2021 07:28 Inactive
@github-actions github-actions bot temporarily deployed to branch-gh-2263-minor-fixes August 4, 2021 07:28 Inactive
@patiencedaur
Copy link
Contributor Author

Too many commits. Make a rebase on the latest branch:

git fetch
git rebase origin/latest
git push -f

I did git pull --rebase origin gh-2263-minor-fixes and git push instead of force-pushing.
Next step is learning about interactive rebase...

@NickVolynkin NickVolynkin changed the base branch from latest to 1.6 August 4, 2021 07:52
@NickVolynkin NickVolynkin changed the base branch from 1.6 to latest August 4, 2021 07:52
@github-actions github-actions bot temporarily deployed to translation-gh-2263-minor-fixes August 4, 2021 08:07 Inactive
@github-actions github-actions bot temporarily deployed to branch-gh-2263-minor-fixes August 4, 2021 08:08 Inactive
@github-actions github-actions bot temporarily deployed to translation-gh-2263-minor-fixes August 4, 2021 15:28 Inactive
@NickVolynkin NickVolynkin merged commit b306c31 into latest Aug 4, 2021
@NickVolynkin NickVolynkin deleted the gh-2263-minor-fixes branch August 4, 2021 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants